add fedora 35 to CI. (#756)

diff --git a/.github/workflows/fedora.yml b/.github/workflows/fedora.yml
index 9e325136affdc4ef075f54b7ae6753ed1b98a93b..b4e517158839d315f7ffaedce9e8a948bf53e11a 100644 (file)
--- a/.github/workflows/fedora.yml
+++ b/.github/workflows/fedora.yml
@@ -17,7 +17,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ['32', '33', '34']
+        # version 32, though obsolete, uses Qt 5.14 so we keep it for that.
+        version: ['32', '35']
     container:
       image: gpsbabel-docker.jfrog.io/tsteven4/gpsbabel_build_environment_f${{ matrix.version }}
       env:

diff --git a/tools/Dockerfile_f35 b/tools/Dockerfile_f35
new file mode 100644 (file)
index 0000000..2ba2d78
--- /dev/null
+++ b/tools/Dockerfile_f35
@@ -0,0 +1,22 @@
+# this file is used to build the image gpsbabel_build_environment used by travis.
+
+FROM fedora:35
+
+LABEL maintainer="https://github.com/tsteven4"
+
+WORKDIR /app
+
+# basic tools to build
+RUN dnf install --assumeyes git make valgrind diffutils which findutils langpacks-en && \
+    dnf clean all
+# libraries used by gpsbabel.  zlib and shapelib may or may not be used depending qmake options.
+RUN dnf install --assumeyes libusb1-devel zlib-devel shapelib-devel && \
+    dnf clean all
+# Qt used by gpsbabel, gpsbabelfe
+RUN dnf install --assumeyes qt5-qtbase-devel qt5-qtserialport-devel qt5-qtwebengine-devel qt5-linguist qt5-qttranslations && \
+    dnf clean all
+# tools to build the docs
+RUN dnf install --assumeyes expat desktop-file-utils libxslt docbook-style-xsl fop && \
+    dnf clean all
+# create a link as fedora uses the name qmake-qt5 for Qt5's qmake.
+RUN alternatives --install /usr/bin/qmake qt /usr/lib64/qt5/bin/qmake 100